gdk/gdkcolor.c (gdk_colormap_new) Fix memory leak: colormap->colors was

1999-09-14  Tor Lillqvist  <tml@iki.fi>

* gdk/gdkcolor.c (gdk_colormap_new)
* gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
colormap->colors was allocated twice.

* gdk/win32/gdk.c: Remove some unused stuff.

* gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
colormap.

* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
* gtk/gtklabel.h (gtk_label_get_type)
* gtk/gtktipsquery.c (gtk_tips_query_get_type)
* gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
in a couple of places, not guint.

diff --git a/ChangeLog b/ChangeLog
index ec1fc40aba982c898e3f565a7bbc9f500a93a739..035debccd0e954ecd0a509c73dd0c1e8e7e2f30d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+1999-09-14  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkcolor.c (gdk_colormap_new)
+       * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
+       colormap->colors was allocated twice.
+
+       * gdk/win32/gdk.c: Remove some unused stuff.
+
+       * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
+       colormap.
+
+       * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
+       * gtk/gtklabel.h (gtk_label_get_type)
+       * gtk/gtktipsquery.c (gtk_tips_query_get_type)
+       * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
+       in a couple of places, not guint.
+
 Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
        * configure.in,po/et.po: added Estonian language file

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ec1fc40aba982c898e3f565a7bbc9f500a93a739..035debccd0e954ecd0a509c73dd0c1e8e7e2f30d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,20 @@
+1999-09-14  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkcolor.c (gdk_colormap_new)
+       * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
+       colormap->colors was allocated twice.
+
+       * gdk/win32/gdk.c: Remove some unused stuff.
+
+       * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
+       colormap.
+
+       * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
+       * gtk/gtklabel.h (gtk_label_get_type)
+       * gtk/gtktipsquery.c (gtk_tips_query_get_type)
+       * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
+       in a couple of places, not guint.
+
 Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
        * configure.in,po/et.po: added Estonian language file

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ec1fc40aba982c898e3f565a7bbc9f500a93a739..035debccd0e954ecd0a509c73dd0c1e8e7e2f30d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+1999-09-14  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkcolor.c (gdk_colormap_new)
+       * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
+       colormap->colors was allocated twice.
+
+       * gdk/win32/gdk.c: Remove some unused stuff.
+
+       * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
+       colormap.
+
+       * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
+       * gtk/gtklabel.h (gtk_label_get_type)
+       * gtk/gtktipsquery.c (gtk_tips_query_get_type)
+       * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
+       in a couple of places, not guint.
+
 Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
        * configure.in,po/et.po: added Estonian language file

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ec1fc40aba982c898e3f565a7bbc9f500a93a739..035debccd0e954ecd0a509c73dd0c1e8e7e2f30d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,20 @@
+1999-09-14  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkcolor.c (gdk_colormap_new)
+       * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
+       colormap->colors was allocated twice.
+
+       * gdk/win32/gdk.c: Remove some unused stuff.
+
+       * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
+       colormap.
+
+       * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
+       * gtk/gtklabel.h (gtk_label_get_type)
+       * gtk/gtktipsquery.c (gtk_tips_query_get_type)
+       * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
+       in a couple of places, not guint.
+
 Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
        * configure.in,po/et.po: added Estonian language file

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ec1fc40aba982c898e3f565a7bbc9f500a93a739..035debccd0e954ecd0a509c73dd0c1e8e7e2f30d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,20 @@
+1999-09-14  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkcolor.c (gdk_colormap_new)
+       * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
+       colormap->colors was allocated twice.
+
+       * gdk/win32/gdk.c: Remove some unused stuff.
+
+       * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
+       colormap.
+
+       * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
+       * gtk/gtklabel.h (gtk_label_get_type)
+       * gtk/gtktipsquery.c (gtk_tips_query_get_type)
+       * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
+       in a couple of places, not guint.
+
 Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
        * configure.in,po/et.po: added Estonian language file

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ec1fc40aba982c898e3f565a7bbc9f500a93a739..035debccd0e954ecd0a509c73dd0c1e8e7e2f30d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,20 @@
+1999-09-14  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkcolor.c (gdk_colormap_new)
+       * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
+       colormap->colors was allocated twice.
+
+       * gdk/win32/gdk.c: Remove some unused stuff.
+
+       * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
+       colormap.
+
+       * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
+       * gtk/gtklabel.h (gtk_label_get_type)
+       * gtk/gtktipsquery.c (gtk_tips_query_get_type)
+       * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
+       in a couple of places, not guint.
+
 Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
        * configure.in,po/et.po: added Estonian language file

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ec1fc40aba982c898e3f565a7bbc9f500a93a739..035debccd0e954ecd0a509c73dd0c1e8e7e2f30d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+1999-09-14  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkcolor.c (gdk_colormap_new)
+       * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak:
+       colormap->colors was allocated twice.
+
+       * gdk/win32/gdk.c: Remove some unused stuff.
+
+       * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the
+       colormap.
+
+       * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type)
+       * gtk/gtklabel.h (gtk_label_get_type)
+       * gtk/gtktipsquery.c (gtk_tips_query_get_type)
+       * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType
+       in a couple of places, not guint.
+
 Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
        * configure.in,po/et.po: added Estonian language file

diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index dd9f2b27b228482baf25692873e5d544c494af66..bd480875431d75563f9d6ffea9aa72fe448d63c5 100644 (file)
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -77,7 +77,6 @@ gdk_colormap_new (GdkVisual *visual,
     case GDK_VISUAL_GRAYSCALE:
     case GDK_VISUAL_PSEUDO_COLOR:
       private->info = g_new0 (GdkColorInfo, colormap->size);
-      colormap->colors = g_new (GdkColor, colormap->size);
       
       private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
                                        (GCompareFunc) gdk_color_equal);

diff --git a/gdk/win32/gdk.c b/gdk/win32/gdk.c
index d9d2dde82027a62ddc3a63a7457f67d545c4c69a..96d6a1c12582110fcb8ac50747ddd9fb3bbf0a2e 100644 (file)
--- a/gdk/win32/gdk.c
+++ b/gdk/win32/gdk.c
@@ -46,8 +46,6 @@ static void    gdkx_XConvertCase      (KeySym        symbol,
 
 static void        gdk_exit_func                (void);
 
-static RETSIGTYPE   gdk_signal                  (int          signum);
-
 
 /* Private variable declarations
  */
@@ -112,7 +110,6 @@ gboolean
 gdk_init_check (int    *argc,
                char ***argv)
 {
-  HRESULT hres;
   gint i, j, k;
   
   if (gdk_initialized)

diff --git a/gdk/win32/gdkcolor-win32.c b/gdk/win32/gdkcolor-win32.c
index 2581e317f10119e73ea44216b4682ea6226e6086..3712222effbefc32486ef1f3c8f9c0cb812d9b27 100644 (file)
--- a/gdk/win32/gdkcolor-win32.c
+++ b/gdk/win32/gdkcolor-win32.c
@@ -1349,7 +1349,6 @@ gdk_colormap_new (GdkVisual *visual,
     case GDK_VISUAL_GRAYSCALE:
     case GDK_VISUAL_PSEUDO_COLOR:
       private->info = g_new0 (GdkColorInfo, colormap->size);
-      colormap->colors = g_new (GdkColor, colormap->size);
       
       private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
                                        (GCompareFunc) gdk_color_equal);
@@ -1487,6 +1486,14 @@ gdk_colormap_sync (GdkColormap *colormap,
       colormap->colors[i].blue = (xpalette[i].peBlue * 65535) / 255;
     }
 
+  for (  ; i < colormap->size; i++)
+    {
+      colormap->colors[i].pixel = i;
+      colormap->colors[i].red = 0;
+      colormap->colors[i].green = 0;
+      colormap->colors[i].blue = 0;
+    }
+
   g_free (xpalette);
 }
                   

diff --git a/gdk/win32/gdkcolor.c b/gdk/win32/gdkcolor.c
index 2581e317f10119e73ea44216b4682ea6226e6086..3712222effbefc32486ef1f3c8f9c0cb812d9b27 100644 (file)
--- a/gdk/win32/gdkcolor.c
+++ b/gdk/win32/gdkcolor.c
@@ -1349,7 +1349,6 @@ gdk_colormap_new (GdkVisual *visual,
     case GDK_VISUAL_GRAYSCALE:
     case GDK_VISUAL_PSEUDO_COLOR:
       private->info = g_new0 (GdkColorInfo, colormap->size);
-      colormap->colors = g_new (GdkColor, colormap->size);
       
       private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
                                        (GCompareFunc) gdk_color_equal);
@@ -1487,6 +1486,14 @@ gdk_colormap_sync (GdkColormap *colormap,
       colormap->colors[i].blue = (xpalette[i].peBlue * 65535) / 255;
     }
 
+  for (  ; i < colormap->size; i++)
+    {
+      colormap->colors[i].pixel = i;
+      colormap->colors[i].red = 0;
+      colormap->colors[i].green = 0;
+      colormap->colors[i].blue = 0;
+    }
+
   g_free (xpalette);
 }
                   

diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index d9d2dde82027a62ddc3a63a7457f67d545c4c69a..96d6a1c12582110fcb8ac50747ddd9fb3bbf0a2e 100644 (file)
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -46,8 +46,6 @@ static void    gdkx_XConvertCase      (KeySym        symbol,
 
 static void        gdk_exit_func                (void);
 
-static RETSIGTYPE   gdk_signal                  (int          signum);
-
 
 /* Private variable declarations
  */
@@ -112,7 +110,6 @@ gboolean
 gdk_init_check (int    *argc,
                char ***argv)
 {
-  HRESULT hres;
   gint i, j, k;
   
   if (gdk_initialized)

diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index dd9f2b27b228482baf25692873e5d544c494af66..bd480875431d75563f9d6ffea9aa72fe448d63c5 100644 (file)
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -77,7 +77,6 @@ gdk_colormap_new (GdkVisual *visual,
     case GDK_VISUAL_GRAYSCALE:
     case GDK_VISUAL_PSEUDO_COLOR:
       private->info = g_new0 (GdkColorInfo, colormap->size);
-      colormap->colors = g_new (GdkColor, colormap->size);
       
       private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
                                        (GCompareFunc) gdk_color_equal);

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 36eaf9b4d087cd3125028bf4bfcbea523ee98e91..b9dc8396986f6c120fe820ec6d5819d8fc07d635 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -3652,7 +3652,7 @@ gtk_font_selection_create_xlfd (gint                size,
  * GtkFontSelectionDialog
  *****************************************************************************/
 
-guint
+GtkType
 gtk_font_selection_dialog_get_type (void)
 {
   static guint font_selection_dialog_type = 0;

diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 892f93d5485169185095739322cc1194a432d8d9..e9de3df32e140f6c5aa4e9579ca6fa36b05066ec 100644 (file)
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -69,7 +69,7 @@ struct _GtkLabelClass
 };
 
 
-guint      gtk_label_get_type      (void);
+GtkType    gtk_label_get_type      (void);
 GtkWidget* gtk_label_new           (const char        *str);
 void       gtk_label_set_text      (GtkLabel          *label,
                                     const char        *str);

diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c
index ccac79a18e7735ae8f97a73138ca6f0b46074400..0d5530cbd3cf4972fee4560bf565baa5eb1cc611 100644 (file)
--- a/gtk/gtktipsquery.c
+++ b/gtk/gtktipsquery.c
@@ -81,7 +81,7 @@ static guint           tips_query_signals[SIGNAL_LAST] = { 0 };
 
 
 /* --- functions --- */
-guint
+GtkType
 gtk_tips_query_get_type (void)
 {
   static guint tips_query_type = 0;

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 3e657b0cb62b9431ddf8f7484d83c32403ca1047..190a36cbde97ebf7bf5ddc29db9968ad7dd942bf 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -333,7 +333,7 @@ GtkType             gtk_type_unique                 (GtkType           parent_type,
                                                 const GtkTypeInfo *type_info);
 void           gtk_type_set_chunk_alloc        (GtkType         type,
                                                 guint           n_chunks);
-gchar*         gtk_type_name                   (guint           type);
+gchar*         gtk_type_name                   (GtkType         type);
 GtkType                gtk_type_from_name              (const gchar    *name);
 GtkType                gtk_type_parent                 (GtkType         type);
 gpointer       gtk_type_class                  (GtkType         type);